Fixed files that were broken becuase of last commit, also update defaulted database