Update Thanks, and impove thanks generator