#34 fix error fields, and validation