Fixed failing DBD test
Restoring intended behaviour... I think
More thoroughly documented options and defaults