columns and minor changes
Merge pull request #30 from Cynaria/columns_and_things

columns and minor changes