Add some helpful comments to the resolve code