some experiments and cleanups