Exit handling
merge fix, and level edits
Client exit fix. Level edits.