added some comments/suggestions from the check-in meeting