rearrange inserts, db schema, db_init