Fixes to lamps
Final map changes