substantial doc improvements