Some bug fixes and final DB

Database now has startup data. Fixed some bugs
Merge pull request #33 from Excelsior-Systems/James_mar20

Some bug fixes and final DB