fixed a function and played with a couple of mappings