Cleanups in thm7
Add missing demo in thm7