made couple changes since the choice menu

Made couple small changes to the code since choice menu became
operational.  Last commit before building another branch that won't
have a choice menu.