Map bug Fix and added stuff to map!