20190908.0: merged f-strings branch
A few bug/typo fixes but mostly converting all string formatting (as much as possible) to f-string format.
A few bug/typo fixes but mostly converting all string formatting (as much as possible) to f-string format.