Acceptance testing feedback incorporated

All changes mentioned in the Acceptance testing feedback PDF except 3,
11, 14 and 15 are completed with this commit