Pruned comments, minor changes.