Final commit.  Cleaned up a few things is all.