few changes

Just a few final things to clean up.