went over merge as group. corrected some minor issues