added/removed a couple of mappings and fixed a few commands