up to 0.6.7, cleanups