changes in Block.cpp
changes in Map.cpp