Some corrections
More modifs
More stuff
Added ccl section