Cleanup

* Cleanup descriptions in options
* Change single to double quotes in query string, to aid with future options
* Cleanup key filtering
* * (Various keys having human readable characters 'b' for bytes, s for seconds, etc)
* Typo - there is no 'network.transport.current_estab' key
* * checked back to 0.20.x for this

Some cleanup for readability