Various cosmetic and minor other enhancements