More work on the quotes module