More line wrapping

Wrapping lines at around 80 chars.