Fix makefile
Fix map.cpp