Cleaned up controller code, flexible control scheme + better gamepad support