bit of cleanup, menu, need to fix reselection