updated to async dependency resolution; and other stuff