Finish

Last few minor changes to a couple of files.