minor enhancements 24 Feb