minor changes
resolved merge conflict
implemented mainmenu state (not working yet)