Improvements to 0.4-0
genCalCols tiny change