Simplify defkey macro
Key binding tweaks
Correct typo