fix comment typo
be extra-careful about validation
fix logging fix