Feature minor enhancements