Fixed line ending issue.  More pretty print work