corrections to code after menu merge; WIP Input stuff