Handling of the comments improved.