More async work. Errors. Fix-ups.