cleanup, fix words processing, switch to async primitives