some diverse changes and clean-ups