MOB-213 some comments implemented