enhancements

small changes