I see you have Pensions for Commonwealth Countries; what about US Government Pensions? I FIRE'd at 40 with a US Military Pension and some other investments, and can't really adapt your tool to my case due to that.

There are some interesting things about those pensions though (and the related VA compensation metrics). I have a spreadsheet I use to advise veterans who get sent my way because there are no decent tools out there for that population.

Otherwise it looks awesome!