added database stuff as well as changed settings