Sumup whole quiz, few improvements