Various edits
Merge pull request #726 from abhinavc/master

Various edits