ENH:  Adding more options for QA stuff.