Major update including async client and many fixes