[add] comments, CR, exeptions.