Small contact importing progress, some cleanup.