disabled debug menu and cleaned up a bit