fix line wrapping issues, column width
merge whatever