Minor changes to db init. + some other stuff...