23 db performance

- more bug fixes