fix quotes
Merge in Patrick's changes