* refactor weights a bit

* post cherry-pick fixes

* do not run spellcheck on new weight files

* fix