minor cleanup/optimization, comment consistency, fixed a big with second subblock color expansion in differential color mode