Updates for quoting

- change the thresholds a bit to better work in real world
- adjust the test case for the new thresholds
- fix extra spacing and newlines in various places