Continue fixing up stuff
Fix all the bugs
Fix stuff