some reorganising, multi-question tallying
fix old commented-out sanity test