Updates to worldmap

just some rearranging of code