Fix for #933 issue

This PR fixes #933, and some minor glitches detailed in the commit messages.
you went from '/*/' to '*'.DS
Wouldn't it be DS.'*'.DS ?