some fixes/improvement found when browsering the files
Merge pull request #9 from tpeng/patch-1

some fixes/improvement found when browsering the files