added comments to handlers