Add some more comments, clean up a few small things.