ZPA model improved, minor bug fixes in Random and Stats
ZPA model improved, but still insufficient