Fix saving bug I introduced earlier; update TODO