another fix
fix
fixed db...and merged...ugh