map and background fixes