Added .ConfigureAwait(false) to awaits.
Removed async/await where unneeded.
Merge branch 'feature/async_await_fixes'