misc fixes.
Merge pull request #30 from puneet/master

misc fixes.