cleanup some stuff, quit is now even cleaner, more comments