Minor changes

Beginning to finish up.