improve comment handling