more waiting / fixing timing issues...