Comments slightly updated