Update to latest zeromod version, and some changes