small enhancements

fixed