mapformat improvements