Completed first batch of changes as suggested by committee.