Added comment reworks