More changes from Marv's comments