Some bug fixes and final DB

Database now has startup data. Fixed some bugs