Code clean up and bug fixes

Right now, the code needs a good clean up for bug fixes, adding features quickly, and prepping the code base for the upcoming TV version.