about to merge master fixed quiz history stuff