Fixes

Fixed a lot of bugs, there are still more things that I need to fix but
its definitely getting there.  Also I fixed the menu class so you
should be able to use it
Renamed something