Added a few more comments, etc.