a few fixes
Merge pull request #1 from amychiu/master

some fixes