Fixing issue #227
Fixing issue #229
Fixing more text as a part of issue #229
Merge pull request #228 from meganap/agut_issue_227

Fixing issue #227
Merge pull request #230 from meganap/agut_issue_229

Fixing issue #229