Issue #2: fixing some of the comments