fixes and added async