db fixes at last..