made most of the small changes asked for