diff --git a/index.html b/index.html
index d481f05..d3438be 100644
--- a/index.html
+++ b/index.html
@@ -184,9 +184,11 @@ You can use this to track and report the data needed for tax reporting. Fill out
 </ul>
 <h5 id="ui-console">UI, console</h5>
 <ul>
-<li><a href="https://github.com/hpdeifel/hledger-iadd">hledger-iadd</a> curses UI for data entry</li>
+<li><a href="https://github.com/simon-v/bean-add">bean-add</a> interactive transaction entry</li>
+<li><a href="http://hledger.org/manual.html#add">hledger add</a> interactive transaction entry (built-in command)</li>
+<li><a href="https://github.com/hpdeifel/hledger-iadd">hledger-iadd</a> curses UI for transaction entry</li>
 <li><a href="http://hackage.haskell.org/package/hledger-ui">hledger-ui</a> curses UI for browsing (<a href="https://asciinema.org/a/29665">demo</a>)</li>
-<li><a href="https://github.com/Tagirijus/ledger-add">ledger-add</a> interactive console UI for data entry</li>
+<li><a href="https://github.com/Tagirijus/ledger-add">ledger-add</a> interactive transaction entry</li>
 <li><a href="https://github.com/Tagirijus/ledger-plot">ledger-plot</a> interactive helper for making charts with gnuplot</li>
 </ul>
 <h5 id="ui-gui">UI, GUI</h5>
@@ -202,9 +204,12 @@ You can use this to track and report the data needed for tax reporting. Fill out
 <li><a href="https://github.com/peterkeen/Ledger-Web">Ledger Web</a> web-based, postgres-backed reporting system</li>
 <li><a href="https://github.com/Ikke/ledger-dashboard">ledger-dashboard</a> web UI for browsing, data entry (Python)</li>
 <li><a href="https://github.com/slashdotdash/node-ledger-web">ledger-web</a> web UI for browsing (JavaScript)</li>
-<li><a href="https://github.com/rstacruz/node-hledger">node-hledger</a> Node.js API (JavaScript)</li>
 <li><a href="https://github.com/readysetmark/WealthPulse">WealthPulse</a> web UI for browsing, price fetching (F#, Ledger)</li>
 </ul>
+<h5 id="api">API</h5>
+<ul>
+<li><a href="https://github.com/rstacruz/node-hledger">node-hledger</a> Node.js API (JavaScript)</li>
+</ul>
 </div>
 <div class="five columns u-pull-right">
 <h3 id="docs">docs</h3>
@@ -281,15 +286,17 @@ You can use this to track and report the data needed for tax reporting. Fill out
 <h5 id="data-entry">data entry</h5>
 <h5 id="reconciling">reconciling</h5>
 <h5 id="reporting">reporting</h5>
+<h5 id="budgeting">budgeting</h5>
+<ul>
+<li><a href="http://www.ledger-cli.org/3.0/doc/ledger3.html#Budgeting">Ledger: Budgeting</a></li>
+<li><a href="http://alan.petitepomme.net/tips/ledger_and_org.html">Using Org for Ledger Reports and Budget</a></li>
+<li><a href="https://gist.github.com/simonmichael/a1addcb652da4e78b183">envelope budgeting example</a></li>
+</ul>
 <h5 id="forecasting">forecasting</h5>
 <ul>
+<li><a href="http://www.ledger-cli.org/3.0/doc/ledger3.html#Forecasting">Ledger: Forecasting</a></li>
 <li><a href="http://atomicules.co.uk/2015/06/20/Notes-on-installing-and-using-Ledger-on-NetBSD.html">Notes on Installing and Using ledger on NetBSD</a> (and forecasting)</li>
 </ul>
-<h5 id="budgetting">budgetting</h5>
-<ul>
-<li><a href="http://alan.petitepomme.net/tips/ledger_and_org.html">Using Org for Ledger Reports and Budget</a></li>
-<li><a href="https://gist.github.com/simonmichael/a1addcb652da4e78b183">envelope budgetting example</a></li>
-</ul>
 <h5 id="shared-expenses">shared expenses</h5>
 <ul>
 <li><a href="https://docs.google.com/document/d/1FRcJqUfeAMQO6KjG94w6rF7VajMGJaFplmF1Wu0rCHY/edit#heading=h.yshh8f17jbdb">Sharing Expenses in Beancount</a> (and others)</li>
diff --git a/index.md b/index.md
index b0b0393..3d353a2 100644
--- a/index.md
+++ b/index.md
@@ -180,10 +180,12 @@ Fill out and submit tax forms with another tool, or by hand.
 
 ##### UI, console
 
-- [hledger-iadd](https://github.com/hpdeifel/hledger-iadd) curses UI for data entry
+- [bean-add](https://github.com/simon-v/bean-add) interactive transaction entry
+- [hledger add](http://hledger.org/manual.html#add) interactive transaction entry (built-in command)
+- [hledger-iadd](https://github.com/hpdeifel/hledger-iadd) curses UI for transaction entry
 - [hledger-ui](http://hackage.haskell.org/package/hledger-ui) curses UI for browsing
   ([demo](https://asciinema.org/a/29665))
-- [ledger-add](https://github.com/Tagirijus/ledger-add) interactive console UI for data entry
+- [ledger-add](https://github.com/Tagirijus/ledger-add) interactive transaction entry
 - [ledger-plot](https://github.com/Tagirijus/ledger-plot) interactive helper for making charts with gnuplot
 
 ##### UI, GUI
@@ -200,9 +202,12 @@ Fill out and submit tax forms with another tool, or by hand.
 - [Ledger Web](https://github.com/peterkeen/Ledger-Web) web-based, postgres-backed reporting system
 - [ledger-dashboard](https://github.com/Ikke/ledger-dashboard) web UI for browsing, data entry (Python)
 - [ledger-web](https://github.com/slashdotdash/node-ledger-web) web UI for browsing (JavaScript)
-- [node-hledger](https://github.com/rstacruz/node-hledger) Node.js API (JavaScript)
 - [WealthPulse](https://github.com/readysetmark/WealthPulse) web UI for browsing, price fetching (F#, Ledger)
 
+##### API
+
+- [node-hledger](https://github.com/rstacruz/node-hledger) Node.js API (JavaScript)
+
 </div>
 <div class="five columns u-pull-right">
 
@@ -289,15 +294,17 @@ Fill out and submit tax forms with another tool, or by hand.
 
 ##### reporting
 
+##### budgeting
+
+- [Ledger: Budgeting](http://www.ledger-cli.org/3.0/doc/ledger3.html#Budgeting)
+- [Using Org for Ledger Reports and Budget](http://alan.petitepomme.net/tips/ledger_and_org.html)
+- [envelope budgeting example](https://gist.github.com/simonmichael/a1addcb652da4e78b183)
+
 ##### forecasting
 
+- [Ledger: Forecasting](http://www.ledger-cli.org/3.0/doc/ledger3.html#Forecasting)
 - [Notes on Installing and Using ledger on NetBSD](http://atomicules.co.uk/2015/06/20/Notes-on-installing-and-using-Ledger-on-NetBSD.html) (and forecasting)
 
-##### budgetting
-
-- [Using Org for Ledger Reports and Budget](http://alan.petitepomme.net/tips/ledger_and_org.html)
-- [envelope budgetting example](https://gist.github.com/simonmichael/a1addcb652da4e78b183)
-
 ##### shared expenses
 
 - [Sharing Expenses in Beancount](https://docs.google.com/document/d/1FRcJqUfeAMQO6KjG94w6rF7VajMGJaFplmF1Wu0rCHY/edit#heading=h.yshh8f17jbdb) (and others)