Rich's changes

Here are some minor changes I made.  The changes should be self explanatory.