Better subject and corrects links