updates and clean-ups