bugfix qvar quoting, update formatting