Small fixes

Capitalisation and context fixes
Merge pull request #466 from bitigchi/patch-2

Small fixes