More variety, realism and anti-frustration for Treaties