refactoring db schema
removed some building bugs
clean up