Fix some organization stuff
Fix keyboard bug - opposing key presses