some changes
added db for ease of setup