new fields, map validation working