Dealt with most of the diff comments