Revert "Revert "some edits on strings""

This reverts commit 5b50e59d14560063b7cafc590dab7a8f0ed4a78b.