Made almost all of Roger's suggested changes