Some rewriting and correcting