Start work on 9.4
Work on 9.4
Add sanity check for plus/minus signs