Added more parameter corrections.
Added more state corrections.