Update to version2 ...

Updated to version 2 and cleaned up some menus and spelling errors.