various minor touch-ups