made some but not of phil's suggested changes