FIXES to issues 1016, 1018, 1031, 1021, 1030, 1049. All related to issue 1027 - needing to update code base so that it is using the appropriate result (remark or original) instead of always using the original.
cutting lines greater than 80 chars into multiple lines
Merge pull request #1052 from akwok18/issue-1016

FIXES to issues 1016, 1018, 1031, 1021, 1030, 1051, 1049.