merged in adjustments from TPrime

including WorldTileMap practice, convertIfNeeded method, additional
notes and such