-Map class added
-Some minor changes/bugfixes