fix various errors, blocking on NameParser infinite recursion