Comments, improved collision

Fixed collision a good bit.  Added comments to more than half of the
classes.