Minor changes to handle string indexing and splitting and writing of raw unescaped text