contact map & general changes