add infra, a few other minor changes