converted a bunch more things to ordered quotes