parameterize some more strings
more string fixes