Various changes and clean-up