Further experiments and cleanups