some midterm cleanup plus Return menu option