edit and add contact fixes according to Jon's email