clean up the models, better handling of content
update http classes for latest models