Tightening claim codes

- Adding claim code validation
- Making responses a little more consistent