wip
wip
wip
fixed db problems