async+perf: changes per PR from @PeterJensen, cleanup, closes #254