Cleaned up menus, reviewed source code comments