Dries: Controller + Keyboard Changes
Dries: Merge + Fix Keyboard/Controller