Finished changes from first set of testers