Fix some issues. Add Database data to repo.