Commenting and stuff

Added some comments, did some minor output changes, provided a
serialization id.