Add Poisson and minor changes