Fix pause handling.
Improve cleanup on return to main menu.