Fixded CoC error on colors.
Fixed contour-zero-ing issues.
Merge back against master.