change a few things
Merge pull request #84 from anniezhn/azhang

change a few things