Closes #100. Oxygen also made a bunch of line wrap changes