new db and some fixes