resolved some async timeout issues