cleanup
tweak timing