Change wrapping to include some context on first line; plus typo fix