clean up, better wait handling