More changes to database and improvements.
Merge pull request #8 from shuyangli/iheanyi-dev

More changes to database and improvements.