fixed silly things
Merge branch 'dbInit'