Feature/add comments ora