merge Toms changes with mine, fix line wrap