Fixing escaping of strings, added more expressive use of references operator