some improvements

* added nicer header handling for spec 0.4
* removed subscriber code