More updated integrating the cgkit stuff, CR feedback