CMap commented and javadoc'd
Minor javadoc and comments