Clean up comments. Add some more things to CINFO as mentioned in #40