More database and stuff, changes