Issue #334: Feedback changes.
Issue #335: Allow providing the EFQ class.
Issue #335: Minor doc changes.