* Correctly wrap errors * Fix comments * Add blank strings before continue, where it missing * Reduce allocations