Improvements in map, drawing and spawn