Lots of cleanup and bug fixes

No more flickering, data validation, bug fixes