move update to new method too, fix some db stuffs (to squash)