FIxes to q4 and renaming of q7a to something less confusing