columns and minor changes