errors, validation improvements