Updated the changes that Paul made and a few that I made