comment handling improved