Fixing a few things and cleaning up a few things.  Super helpful commit message.