Add map and small fixes