just oodles of small fixes.