Updates to mapping and comments