fixes for ddp-pre1 not ready yet, cleaned db