database improvements
Merge pull request #2 from ray176/databaseImprovements

database improvements