#C7 - Corrections to #C6 and other modifications

#C7 - Corrections to #C6 and other modifications