Added q_and_a method with tests. Tweaked tests and other methods.