Start fixing and clean up the DB -- fixing some errors & renaming previous sql commit . - Part 1 of these fixes.