Fixed a few bugs and added support for columns