Hard line wraps.  More tweaks and polish.