lots of changes to hopefully make mappings work to the fullest... unit tests coming...
fixing test for full coverage