cleanup and corrected links