a few changes and more menu options