fix menus, comments