small clean up
handling some new responses