Cleanup and cosmetic changes
Fix the godamn quit behavior once and for all (OSX)
Massive cleanup