Fix comments

I took this over from Evaldas and changed the comments according to your suggestions.