Small cosmetic enhancements and bug fixes.