More work on commenting; renaming things to be clearer.
Merge pull request #60 from spartan-array/c2

More work on commenting; renaming things to be clearer.