reworked user controls

clean up and what not