Comments handling improved.