More demos, some cleanups