More spelling and clean-up.