[contact] A few touchups and another 35 lines.