improved error message
field with errors
more improved error message, tests, and improved current_claim