bug fixes + added database to commit for testing