db fixes
fix
fix
fix
fix
fix
fix
fix
fix
fix
fix
fix
fix
fix
fix
optimization tweeks