Adding links and correcting samples