fixes to 3.30 to match 3.24

fix hermaphroditism
fix forecast catch
still have issue that will affect forecast when there are multiple
settlement events