lots of small fixes to quotes etc.