updates and clean-up