bug fixes, mutli-db provisions