fixes for push wait
tidy