various tweaks and cleanups

decided to do a PR against your PR so you can see what i am doing.
not sure its worth it. this way we can have specific text, instead of a generic text that fits in all context. its not a long text.