more style fixes, and condensed key bindings