Fixed original issue #4 and #5 - failing dump, and no option for column size when wrapping