- change to multiple handlerlists
- some little changes