added yes/no fields, validation for numbers