Updated Question template, and redid total question tracking