Sanitized some more stuff.