Various additions and clean-ups.