Various enhancements / bug fixes.