Add entity ddp-solver if possible.
Fix minor bugs.