-map functionality added
-fixed more stuff