various fixes: better provisioning, but need more work