Tons of simplifications
More cleanups and better input mapping