Finished incorporating Rich's comments
A final pass to edit changes