moving a few things around and adding a few more comments