Fixed #160

And small updates of comments