w/ comments

updated comments