Updating comments
Working on the fall through helpers, not done yet