More DB changes, tweaking loading