commit
merge
Fix RE, clean up error messages
add names to fields