Free up some unused evil keys, plus other minor changes