Improvements to comments attribution

I create this pull request to discuss possible improvements to comments attributions. I added a couple of comments explaining why I expect certain results. If we agree that make sense I could document this logic.