MOre bltx output
Moved date parsing to sub
Added contenttype
Nasty merge from dev