Fix a few comments

more to come in the next days