Improved a few line wraps...