expense-tracker: even more fixes