db updates and better export