added map
map
some fixes