minor updates / clean-ups