fix typo
fix async issues
hopefully taking remaining bill's comments into account.