fixed errors, confrimed all menu options work correctly