Cleanups; implemented DPad support