changes
fixed merge conflicts
fixed numcolsinRow for this compiler