async fixes
Merge pull request #346 from patriot1burke/Branch_2_3

async fixes