Small fixes

Capitalisation and context fixes
Merge pull request #467 from bitigchi/patch-3

Small fixes