globally streamlined the use of " vs. ' for marking strings
integrating latest changes from nicole