Edits from JAAkana, line wrapping