added menus plus bug fixes.