fixes

- update db_setup_demo
- various bug/style fixes