Fixed async oversight and general cleanup