Cleanup and bugfixes
All done