full validation, tiny fixes