Merge pull request #57 from BurntPizza/dev

more tweaks/fixes
fixed bugs, moved some menu info around