cleanup comments
Add reponse error messages + tests for error states