some adjustments due to feedback

some adjustments due to feedback