Reworked updating mechanism
Small refactoring
Restored Quit, not that it mattered