New improvements and clean-up.