Finished the menu, and cleaned up some stuff...