Added more Async methods. Code tidyup.