fix texts and add comments