Found it, Larry! I'd missed off the options for Area Fire and Indirect Fire, so have included those now. There is a minor discrepancy between the book and the calculator (and the entry on page 122) and that is the cost of being Amphibious. I used 10 points for all the units in the book, but the entry on page 122 states 5 points. I've corrected that in the software and will do so in the book. To confirm: Amphibious costs 10 points.
Will upload the new version shortly