Fix some more things
Merge pull request #69 from anniezhn/azhang

Fix some more things