Anonymize. a few typo/bug fixes