UPDATED database

import latest database
- various bug fixes