fix for html in response
code cleanup
more methods added