Made a few miscellaneous changes.