Cleanup
Change Assembly Info
Fix bad singleton