Clean Up and Misc Bugfixes