Renamed controller to keyboard

I renamed controller to keyboard since it’s smarter that way, plus made
some minor changes.