Minor changes, wrapping a few lines at 80 chars