Minor feature enhancements