Fixes and clean up. Did some major changes on the map composite, it contained a lot of brain farts. The map side is still in progress. Added initial test for set based component.