Fix up escaping and add zzz todo markers