Renamed a few things and fixed a space key glitch.