Fixed line wrap

makes the lines wrap from 0 to 1 to 2 to 3 instead of 0 to 2 to 1 to 3.
also fixed several of the indents