add expected responses, fix some styling, tidy up