Several fixes
Restored GUI quit