diff --git a/container/src/hledger-flow/accounts/electrum/electrum-shared.rules b/container/src/hledger-flow/accounts/electrum/electrum-shared.rules
index 72f6819..07d4057 100644
--- a/container/src/hledger-flow/accounts/electrum/electrum-shared.rules
+++ b/container/src/hledger-flow/accounts/electrum/electrum-shared.rules
@@ -48,13 +48,14 @@ if %direction ^IN$
 if %direction ^IN$
 & %label Gift
   account2 income:electrum:%subaccount:gifts:BTC
-  comment2 %timestamp,GIFTIN,electrum,BTC,%value_without_fee,USD,%fiat_value,Unknown
+  comment2 %timestamp,GIFTIN,electrum,BTC,%value_without_fee,USD,%fiat_value,To %subaccount
+# NOTE: fiat_value must be manually updated in custom rules if your given cost-basis will be different
 
 # OUT
 
 if %direction ^OUT$
   account2 expenses:electrum:%subaccount:BTC
-  comment2 %timestamp,SPEND,electrum,BTC,%value_without_fee,USD,,
+  comment2 %timestamp,SPEND,electrum,BTC,%value_without_fee,USD,%fiat_value,From %subaccount
 
 if %direction ^OUT$
 & %label (Self|Equity transfer|Capital contribution)
@@ -65,7 +66,7 @@ if %direction ^OUT$
 if %direction ^OUT$
 & %label Gift
   account2 expenses:electrum:%subaccount:gifts:BTC
-  comment2 %timestamp,GIFT,electrum,BTC,%value_without_fee,USD,%fiat_value,Unknown
+  comment2 %timestamp,GIFT,electrum,BTC,%value_without_fee,USD,%fiat_value,From %subaccount
 
 # Fees
 if %direction ^OUT$
@@ -76,6 +77,6 @@ if %direction ^OUT$
   amount4 %fee BTC
   comment txid:%txid, notes:%label, taxed_as:SPEND
   comment3 %timestamp,SPEND,electrum,BTC,%fee,USD,%fiat_fee,FEE
-# comment3 so account2 SPEND isn't overwritten, when applicable
+# Using comment3 so a comment2 SPEND isn't overwritten (when applicable)
 
 # vim: sw=2 sts=2 si ai et