minor modifications + reviews

Minor modifications and reviews.