Bugfixes, merged OOP with master.
Buxfixes. Previous merge didn't take.
Added menus, various other addtions/fixes
Various improvements/bugfixes