return member variables to indicate q vectors, modified constructor to match scenario conditions