add an await, a few stale FIXes become TODOs