added/updated code comments to reflect current challenges