Updates

Various updates for pyro