added some requested changes

added my changes. please review.