Commenting

Lots of comments and cleanup