Task cleanup

Fixed all the async/await warnings, and then all the other build warnings too.
Not sure I understand this one?