Added ability to remove the columns, and fixed a bug