Fix bug and edit comments