Tidying up. Adding support for name setting with map position choosing.