Some more suggestions

Just winging it, see where this lands. Feel free to edit/change/erase.
Promise to keep commits from spam-level, in the future.