fixed some async annoyances.