Add missing demo in thm8
Minor cleanups in thm8