Updated: Clean up some more

I will eventually get around to fixing some of the glaring issues and bugs visible from just a glance of the source.