-Hacky fix to string editing issues.
-Removed debug call.
Merge pull request #592 from mmcguinn/hassan

Hassan