debugging
add some waits
Cleanup focust, shorter timeouts