map stuff, new solar
minor map fixes