added rpi to model, added two more years of simulations on each run, increased default sample size to 400