some enhancements

some enhancements