some minor enhancements before launch