add comments and logs