major rewrite of models, filter parsing, ...
fixed some lib deps