Updated some of the tickets from PSA
Corrections following psa review
Merge pull request #77 from khalid-bd/updates

Updates