adding comments at many places