Add quoted-string and fix various TODOs