Various enhancements and refinements.