More work on commenting; renaming things to be clearer.