Make Clean and Menu Gen edit

Fixed the cleans in the make file and changed some things in Erik's Menu
Test Generation... sadly the changes didn't seem to help.