diff --git a/.gitignore b/.gitignore
index 0c90f947c..f4c6db292 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,6 @@ __pycache__/
 # Nim
 _*
 spec/nim/tests/bin
+
+# Rust compiled code, cargo and rls data
+spec/rust/target/
diff --git a/formats_err/attr_bad_key.ksy b/formats_err/attr_bad_key.ksy
index ee274911d..f389e2277 100644
--- a/formats_err/attr_bad_key.ksy
+++ b/formats_err/attr_bad_key.ksy
@@ -1,4 +1,4 @@
-# /seq/1/blah: unknown key found, expected: consume, contents, doc, eos-error, id, if, include, parent, process, repeat, size, size-eos, terminator, type
+# /seq/1/blah: unknown key found, expected: consume, contents, doc, doc-ref, eos-error, id, if, include, pad-right, parent, process, repeat, size, size-eos, terminator, type, valid
 meta:
   id: attr_bad_key
   endian: le
diff --git a/formats_err/expr_unbalanced.ksy b/formats_err/expr_unbalanced.ksy
index cbff2d76a..eedbb66d6 100644
--- a/formats_err/expr_unbalanced.ksy
+++ b/formats_err/expr_unbalanced.ksy
@@ -1,4 +1,4 @@
-# /seq/0: parsing expression '(1 + 5' failed on 1:1, expected "not" ~ not_test | comparison
+# /seq/0: parsing expression '(1 + 5' failed on 1:1, expected "not" ~ !(namePart) ~ not_test | comparison
 meta:
   id: expr_unbalanced
 seq:
diff --git a/formats_err/meta_bad_key.ksy b/formats_err/meta_bad_key.ksy
index ee66b6002..a152b2e4a 100644
--- a/formats_err/meta_bad_key.ksy
+++ b/formats_err/meta_bad_key.ksy
@@ -1,4 +1,4 @@
-# /meta/foo: unknown key found, expected: application, encoding, endian, file-extension, id, ks-debug, ks-version, license, title
+# /meta/foo: unknown key found, expected: application, bit-endian, encoding, endian, file-extension, id, imports, ks-debug, ks-opaque-types, ks-version, license, tags, title, xref
 meta:
   id: meta_bad_key
   foo: bad_key
diff --git a/formats_err/params_call_short_malformed.ksy b/formats_err/params_call_short_malformed.ksy
index 037f2e10c..930154257 100644
--- a/formats_err/params_call_short_malformed.ksy
+++ b/formats_err/params_call_short_malformed.ksy
@@ -1,4 +1,4 @@
-# /seq/0: parsing expression '2 + 3, ' failed on 1:6
+# /seq/0: parsing expression '2 + 3, ' failed on 1:6, expected CharsWhile(Set( , n)) | "\\\n" | End
 meta:
   id: params_call_short_malformed
 seq:
diff --git a/formats_err/repeat_incompatible1.ksy b/formats_err/repeat_incompatible1.ksy
index a5a4e2cbe..6570d1275 100644
--- a/formats_err/repeat_incompatible1.ksy
+++ b/formats_err/repeat_incompatible1.ksy
@@ -1,4 +1,4 @@
-# /seq/0/repeat-until: unknown key found, expected: consume, doc, doc-ref, eos-error, id, if, include, repeat, terminator, type
+# /seq/0/repeat-until: unknown key found, expected: consume, doc, doc-ref, eos-error, id, if, include, repeat, terminator, type, valid
 meta:
   id: repeat_incompatible1
 seq:
diff --git a/formats_err/repeat_incompatible3.ksy b/formats_err/repeat_incompatible3.ksy
index d71f75af7..0b06f461d 100644
--- a/formats_err/repeat_incompatible3.ksy
+++ b/formats_err/repeat_incompatible3.ksy
@@ -1,4 +1,4 @@
-# /seq/0/repeat-expr: unknown key found, expected: consume, doc, doc-ref, eos-error, id, if, include, repeat, repeat-until, terminator, type
+# /seq/0/repeat-expr: unknown key found, expected: consume, doc, doc-ref, eos-error, id, if, include, repeat, repeat-until, terminator, type, valid
 meta:
   id: repeat_incompatible3
 seq:
diff --git a/formats_err/repeat_wo_repeat.ksy b/formats_err/repeat_wo_repeat.ksy
index ec7973d9c..274bc3899 100644
--- a/formats_err/repeat_wo_repeat.ksy
+++ b/formats_err/repeat_wo_repeat.ksy
@@ -1,4 +1,4 @@
-# /seq/0/repeat-until: unknown key found, expected: consume, doc, doc-ref, eos-error, id, if, include, repeat, terminator, type
+# /seq/0/repeat-until: unknown key found, expected: consume, doc, doc-ref, eos-error, id, if, include, repeat, terminator, type, valid
 meta:
   id: repeat_wo_repeat
 seq:
diff --git a/formats_err/switch_cases_malformed_quoting.ksy b/formats_err/switch_cases_malformed_quoting.ksy
index a7969373e..8a279c67f 100644
--- a/formats_err/switch_cases_malformed_quoting.ksy
+++ b/formats_err/switch_cases_malformed_quoting.ksy
@@ -1,4 +1,4 @@
-# /seq/1/cases/^AHEM: parsing expression '^AHEM' failed on 1:1, expected "not" ~ not_test | comparison
+# /seq/1/cases/^AHEM: parsing expression '^AHEM' failed on 1:1, expected "not" ~ !(namePart) ~ not_test | comparison
 meta:
   id: switch_cases_malformed_quoting
 seq: