Another round of polish & include @c089 suggestions
Revert "JS === and fix msg" - wrong branch

This reverts commit d9d6772fd411853b64b75bc6237e319ae385b27c.