wrap algorithm tweaks
definition of "nicer wrapping" has changed again
fixed a mistake in previous "nicer wrapping" change
nicer wrapping