made some calls to be async to make them not blocking
removed async:false from context calls