minor menu handling changes

not fully working yet, some comments added