niko added locations to JMT, tidied things up -- ready for maps