Better columns and minor fixes.