ongoing experiments, cleanups