Added in response codes with other small changes #13