Fixed classi. report bug, re-organized