minor enhancements

minor enhancements