Various Fixes (back to linear, changed key mappings, etc)