Argument --cols and some cleanup. A lot slower now.