a few more edits and improvements

mostly in the ccl