fixed some bugs with the menu and conflicting names.