made most of the changes asked for during the production check