Some bug fixes and added the ability to calculate the Q-factor values.
Authored by: bugman 2008-09-24
Parent: [r7229]
Child: [r7231]
