Cleaning up user quit checking, and upgraded version :)