• Various minor enhancements