map updates

sixties & conflict
willing to do others