a lot of database stuff
fixing merges
no _id col bug still there...