Added some comments, removed more cruft.