Adapted to newest libs, minor refactoring
Adapted to newest libs
Removed default diffmult
Testing content