added inString and inComments capability
undo test changes