Added some comments, etc.