Updates and clean-up