Fixed project setup, updated db