added comments to track bug