diff --git a/accounts/Bank_1_Account_1.txt b/accounts/Bank_1_Account_1.txt
index 54bcd57..f0f28c1 100644
--- a/accounts/Bank_1_Account_1.txt
+++ b/accounts/Bank_1_Account_1.txt
@@ -1,13 +1,13 @@
-ID;		Bank_XYZ_Account_nr_xyz_somethingsomething
+ID;			Bank_XYZ_Account_nr_xyz_somethingsomething
 Type;		Account
 Purpose;	Liquidity
 Currency;	USD
 Transactions;
 Date(DD.MM.YYYY);	Action;		Amount;		Balance;	Notes;
-01.12.2014;		Update;		0;		4500.00;	Creation of account
-31.12.2014;		Interest;	9.40;		4530.70;	The balance can be arbitrary
-31.12.2015;		Interest;	5.90;		5116.60;
-31.12.2015;		Fee;		10.00;		5100.00;	Multiple transactions with the same date are OK
-31.12.2016;		Interest;	3.75;		5120.35;
-31.12.2017;		Interest;	2.35;		5222.70;	Yey, Money!
+01.12.2014;			Update;		0;			4500.00;	Creation of account
+31.12.2014;			Interest;	9.40;		4530.70;	The balance can be arbitrary
+31.12.2015;			Interest;	5.90;		5116.60;
+31.12.2015;			Fee;		10.00;		5100.00;	Multiple transactions with the same date are OK
+31.12.2016;			Interest;	3.75;		5120.35;
+31.12.2017;			Interest;	2.35;		5222.70;	Yey, Money!
 EOF
diff --git a/accounts/Bank_2_Account_1.txt b/accounts/Bank_2_Account_1.txt
index 7755522..2654a6c 100644
--- a/accounts/Bank_2_Account_1.txt
+++ b/accounts/Bank_2_Account_1.txt
@@ -1,10 +1,10 @@
-ID;		Bank_XYZ_Account_nr_xyz_somethingsomething
+ID;			Bank_XYZ_Account_nr_xyz_somethingsomething
 Type;		Account
 Purpose;	Cash
 Currency;	CHF
 Transactions;
 Date(DD.MM.YYYY);	Action;		Amount;		Balance;	Notes;
-31.12.2017;		Update;		0;		8962.0;	
-05.01.2018;		Update;		0;		9000.0;		Yey, Money!
-10.02.2018;		Interest;	0;		10000.0;
+31.12.2017;			Update;		0;			8962.0;	
+05.01.2018;			Update;		0;			9000.0;		Yey, Money!
+10.02.2018;			Interest;	0;			10000.0;
 EOF
diff --git a/accounts/Bank_2_Account_2.txt b/accounts/Bank_2_Account_2.txt
index e2b7a68..5d2aade 100644
--- a/accounts/Bank_2_Account_2.txt
+++ b/accounts/Bank_2_Account_2.txt
@@ -1,24 +1,24 @@
-ID;		Bank_XYZ_Account_nr_xyz_somethingsomething
+ID;			Bank_XYZ_Account_nr_xyz_somethingsomething
 Type;		Account
 Purpose;	Liquidity
 Currency;	CHF
 Transactions;
 Date(DD.MM.YYYY);	Action;		Amount;		Balance;	Notes;
-16.02.2015;		Update;		0;		230.0;
-12.07.2015;		Fee;		106.07;		343.93;
-21.09.2015;		Fee;		23.00;		376.98; 	Yey, Money!
-14.12.2015;		Fee;		23.05;		423.33;
-31.12.2015;		Update;		0;		420.93;
-22.03.2016;		Fee;		30.35;		5402.28;
-06.06.2016;		Update;		0;		5551.18;
-21.06.2016;		Fee;		28.85;		5522.33;
-19.12.2016;		Fee;		30.50;		11141.88;
-31.12.2016;		Update;		0;		11142.99;
-22.03.2017;		Fee;		31.10;		11051.34;
-06.06.2017;		Update;		0;		12747.19;
-20.06.2017;		Fee;		31.15;		12716.04;
-19.09.2017;		Fee;		31.40;		12847.39;
-20.12.2017;		Fee;		31.70;		12815.69;	
-31.12.2017;		Update;		0;		12817.18;
-22.03.2018;		Fee;		31.55;		12708.98;
+16.02.2015;			Update;		0;			230.0;
+12.07.2015;			Fee;		106.07;		343.93;
+21.09.2015;			Fee;		23.00;		376.98; 	Yey, Money!
+14.12.2015;			Fee;		23.05;		423.33;
+31.12.2015;			Update;		0;			420.93;
+22.03.2016;			Fee;		30.35;		5402.28;
+06.06.2016;			Update;		0;			5551.18;
+21.06.2016;			Fee;		28.85;		5522.33;
+19.12.2016;			Fee;		30.50;		11141.88;
+31.12.2016;			Update;		0;			11142.99;
+22.03.2017;			Fee;		31.10;		11051.34;
+06.06.2017;			Update;		0;			12747.19;
+20.06.2017;			Fee;		31.15;		12716.04;
+19.09.2017;			Fee;		31.40;		12847.39;
+20.12.2017;			Fee;		31.70;		12815.69;	
+31.12.2017;			Update;		0;			12817.18;
+22.03.2018;			Fee;		31.55;		12708.98;
 EOF
diff --git a/accounts/Bank_3_Account_1.txt b/accounts/Bank_3_Account_1.txt
index 3f49c60..fbd5007 100644
--- a/accounts/Bank_3_Account_1.txt
+++ b/accounts/Bank_3_Account_1.txt
@@ -1,10 +1,10 @@
-ID;		Bank_XYZ_Account_nr_xyz_somethingsomething
+ID;			Bank_XYZ_Account_nr_xyz_somethingsomething
 Type;		Account
 Purpose;	Retirement_Closed
 Currency;	CHF
 Transactions;
 Date(DD.MM.YYYY);	Action;		Amount;		Balance;	Notes;
-09.03.2015;		Update;		0;		4500.00;
-12.01.2016;		Update;		0;		7863.00;	Yey, Money!
-03.01.2017;		Update;		0;		8320.00;
+09.03.2015;			Update;		0;			4500.00;
+12.01.2016;			Update;		0;			7863.00;	Yey, Money!
+03.01.2017;			Update;		0;			8320.00;
 EOF
diff --git a/accounts/Bank_4_Account_1.txt b/accounts/Bank_4_Account_1.txt
index b966003..48d45da 100644
--- a/accounts/Bank_4_Account_1.txt
+++ b/accounts/Bank_4_Account_1.txt
@@ -1,16 +1,16 @@
-ID;		Bank_XYZ_Account_nr_xyz_somethingsomething
+ID;			Bank_XYZ_Account_nr_xyz_somethingsomething
 Type;		Account
 Purpose;	Savings_Car
 Currency;	SGD
 Transactions;
 Date(DD.MM.YYYY);	Action;		Amount;		Balance;	Notes;
-17.07.2015;		Update;		0;		8000.00;	
-31.12.2015;		Update;		0;		8500.00;
-30.12.2016;		Fee;		16.20;		8300.00;	Mario was here.
-31.03.2017;		Fee;		16.20;		8200.00;
-30.06.2017;		Fee;		16.20;		8100.00;
-29.09.2017;		Fee;		16.20;		8250.00;
-29.12.2017;		Fee;		16.20;		8368.00;
-02.04.2018;		Fee;		16.16;		8436.00;
-20.04.2018;		Update;		0;		9500.00;
+17.07.2015;			Update;		0;			8000.00;	
+31.12.2015;			Update;		0;			8500.00;
+30.12.2016;			Fee;		16.20;		8300.00;	
+31.03.2017;			Fee;		16.20;		8200.00;
+30.06.2017;			Fee;		16.20;		8100.00;
+29.09.2017;			Fee;		16.20;		8250.00;
+29.12.2017;			Fee;		16.20;		8368.00;
+02.04.2018;			Fee;		16.16;		8436.00;
+20.04.2018;			Update;		0;			9500.00;
 EOF
diff --git a/accounts/Bank_4_Account_2.txt b/accounts/Bank_4_Account_2.txt
index c238e89..88417d1 100644
--- a/accounts/Bank_4_Account_2.txt
+++ b/accounts/Bank_4_Account_2.txt
@@ -1,10 +1,10 @@
-ID;		Bank_XYZ_Account_nr_xyz_somethingsomething
+ID;			Bank_XYZ_Account_nr_xyz_somethingsomething
 Type;		Account
 Purpose;	Liquidity
 Currency;	EUR
 Transactions;
 Date(DD.MM.YYYY);	Action;		Amount;		Balance;	Notes;
-31.12.2016;		Update;		0;		1790.96;
-30.08.2017;		Update;		0;		2360.78;
-31.01.2018;		Update;		0;		2900.55; 	Yey, Money!
+31.12.2016;			Update;		0;			1790.96;
+30.08.2017;			Update;		0;			2360.78;
+31.01.2018;			Update;		0;			2900.55; 	Yey, Money!
 EOF
diff --git a/accounts/Bank_4_Account_3.txt b/accounts/Bank_4_Account_3.txt
index 924653f..3818082 100644
--- a/accounts/Bank_4_Account_3.txt
+++ b/accounts/Bank_4_Account_3.txt
@@ -1,12 +1,12 @@
-ID;		Bank_XYZ_Account_nr_xyz_somethingsomething
+ID;			Bank_XYZ_Account_nr_xyz_somethingsomething
 Type;		Account
 Purpose;	Savings_House
 Currency;	USD
 Transactions;
 Date(DD.MM.YYYY);	Action;		Amount;		Balance;	Notes;
-31.12.2016;		Update;		0;		5300.38;
-27.07.2017;		Update;		0;		5310.51;
-07.09.2017;		Update;		0;		5900.50;	Yey, Money!
-02.02.2018;		Update;		0;		7800.12;
-04.04.2018;		Update;		0;		9650.11;
+31.12.2016;			Update;		0;			5300.38;
+27.07.2017;			Update;		0;			5310.51;
+07.09.2017;			Update;		0;			5900.50;	Yey, Money!
+02.02.2018;			Update;		0;			7800.12;
+04.04.2018;			Update;		0;			9650.11;
 EOF
diff --git a/accounts/Bank_5_Account_1.txt b/accounts/Bank_5_Account_1.txt
index b3a2cc7..b2e3712 100644
--- a/accounts/Bank_5_Account_1.txt
+++ b/accounts/Bank_5_Account_1.txt
@@ -4,40 +4,40 @@ Purpose;	Liquidity
 Currency;	CHF
 Transactions;
 Date(DD.MM.YYYY);	Action;		Amount;		Balance;	Notes;
-01.01.2004;		Update;		0;		24.99;
-01.01.2005;		Update;		0;		-2.77;
-01.01.2006;		Update;		0;		360.08;		Yey, Money!
-20.03.2007;		Update;		0;		215.83;
-01.01.2008;		Update;		0;		3997.18;
-03.01.2009;		Update;		0;		5620.03;
-01.01.2010;		Update;		0;		5390.25;
-03.01.2011;		Update;		0;		6223.75;
-05.01.2012;		Update;		0;		6332.75;
-02.01.2013;		Update;		0;		4409.49;
-01.01.2014;		Update;		0;		6538.44;
-31.12.2014;		Update;		0;		3968.52;
-01.01.2015;		Update;		0;		4928.02;
-31.12.2015;		Interest;	12.85;		6508.26;
-02.01.2016;		Update;		0;		4485.36;
-19.09.2016;		Interest;	8.20;		5347.89;
-02.11.2016;		Fee;		6.00;		8682.55;
-02.12.2016;		Fee;		6.00;		5943.50;
-30.12.2016;		Update;		0;		9478.50;
-04.01.2017;		Fee;		6.00;		9367.75;
-01.02.2017;		Fee;		6.00;		8196.70;
-01.03.2017;		Fee;		6.00;		8289.80;
-04.04.2017;		Fee;		6.00;		8435.20;
-03.05.2017;		Fee;		6.00;		7103.70;
-01.06.2017;		Fee;		6.00;		6651.65;
-04.07.2017;		Fee;		6.00;		9171.38;
-02.08.2017;		Fee;		6.00;		9763.35;
-04.09.2017;		Fee;		6.00;		8038.90;
-02.10.2017;		Fee;		6.00;		7440.80;
-02.11.2017;		Fee;		6.00;		6251.50;
-04.12.2017;		Fee;		5.00;		5135.84;
-29.12.2017;		Update;		0;		8391.14;
-03.01.2018;		Fee;		5.00;		9003.24;
-01.02.2018;		Fee;		5.00;		8417.44;
-02.03.2018;		Fee;		5.00;		5356.64;
-09.04.2018;		Update;		0;		7995.69;
+01.01.2004;			Update;		0;			24.99;
+01.01.2005;			Update;		0;			-2.77;
+01.01.2006;			Update;		0;			360.08;		Yey, Money!
+20.03.2007;			Update;		0;			215.83;
+01.01.2008;			Update;		0;			3997.18;
+03.01.2009;			Update;		0;			5620.03;
+01.01.2010;			Update;		0;			5390.25;
+03.01.2011;			Update;		0;			6223.75;
+05.01.2012;			Update;		0;			6332.75;
+02.01.2013;			Update;		0;			4409.49;
+01.01.2014;			Update;		0;			6538.44;
+31.12.2014;			Update;		0;			3968.52;
+01.01.2015;			Update;		0;			4928.02;
+31.12.2015;			Interest;	12.85;		6508.26;
+02.01.2016;			Update;		0;			4485.36;
+19.09.2016;			Interest;	8.20;		5347.89;
+02.11.2016;			Fee;		6.00;		8682.55;
+02.12.2016;			Fee;		6.00;		5943.50;
+30.12.2016;			Update;		0;			9478.50;
+04.01.2017;			Fee;		6.00;		9367.75;
+01.02.2017;			Fee;		6.00;		8196.70;
+01.03.2017;			Fee;		6.00;		8289.80;
+04.04.2017;			Fee;		6.00;		8435.20;
+03.05.2017;			Fee;		6.00;		7103.70;
+01.06.2017;			Fee;		6.00;		6651.65;
+04.07.2017;			Fee;		6.00;		9171.38;
+02.08.2017;			Fee;		6.00;		9763.35;
+04.09.2017;			Fee;		6.00;		8038.90;
+02.10.2017;			Fee;		6.00;		7440.80;
+02.11.2017;			Fee;		6.00;		6251.50;
+04.12.2017;			Fee;		5.00;		5135.84;
+29.12.2017;			Update;		0;			8391.14;
+03.01.2018;			Fee;		5.00;		9003.24;
+01.02.2018;			Fee;		5.00;		8417.44;
+02.03.2018;			Fee;		5.00;		5356.64;
+09.04.2018;			Update;		0;			7995.69;
 EOF
diff --git a/accounts/Bank_5_Account_2.txt b/accounts/Bank_5_Account_2.txt
index ec869e4..1d7b117 100644
--- a/accounts/Bank_5_Account_2.txt
+++ b/accounts/Bank_5_Account_2.txt
@@ -1,30 +1,30 @@
-ID;		Bank_XYZ_Account_nr_xyz_somethingsomething
+ID;			Bank_XYZ_Account_nr_xyz_somethingsomething
 Type;		Account
 Purpose;	Safety_Reserve
 Currency;	CHF
 Transactions;
 Date(DD.MM.YYYY);	Action;		Amount;		Balance;	Notes;
-30.08.2010;		Update;		0;		25095.45;
-28.12.2010;		Update;		0;		26095.45;
-01.01.2011;		Update;		0;		24284.40;
-29.12.2011;		Update;		0;		23784.40;
-11.01.2012;		Update;		0;		21960.80;	Yey, Money!
-31.12.2012;		Update;		0;		23421.40;
-04.09.2013;		Update;		0;		26421.40;
-31.12.2013;		Update;		0;		27537.30;
-03.01.2014;		Update;		0;		26034.05;
-05.01.2015;		Update;		0;		27753.15;
-01.01.2016;		Interest;	159.75;		28359.25;
-19.09.2016;		Interest;	88.80;		29438.70;
-31.12.2016;		Interest;	16.45;		27072.05;
-24.01.2017;		Update;		0;		28066.30;
-25.01.2017;		Update;		0;		25818.30;
-25.05.2017;		Update;		0;		24918.35;
-27.06.2017;		Update;		0;		26690.60;
-25.08.2017;		Update;		0;		27124.96;
-30.12.2017;		Interest;	59.25;		28520.05;
-12.01.2018;		Update;		0;		25520.05;	
-12.01.2018;		Update;		0;		26020.05;	
-23.01.2018;		Update;		0;		28122.80;	
-09.04.2018;		Update;		0;		28402.25;
+30.08.2010;			Update;		0;			25095.45;
+28.12.2010;			Update;		0;			26095.45;
+01.01.2011;			Update;		0;			24284.40;
+29.12.2011;			Update;		0;			23784.40;
+11.01.2012;			Update;		0;			21960.80;	Yey, Money!
+31.12.2012;			Update;		0;			23421.40;
+04.09.2013;			Update;		0;			26421.40;
+31.12.2013;			Update;		0;			27537.30;
+03.01.2014;			Update;		0;			26034.05;
+05.01.2015;			Update;		0;			27753.15;
+01.01.2016;			Interest;	159.75;		28359.25;
+19.09.2016;			Interest;	88.80;		29438.70;
+31.12.2016;			Interest;	16.45;		27072.05;
+24.01.2017;			Update;		0;			28066.30;
+25.01.2017;			Update;		0;			25818.30;
+25.05.2017;			Update;		0;			24918.35;
+27.06.2017;			Update;		0;			26690.60;
+25.08.2017;			Update;		0;			27124.96;
+30.12.2017;			Interest;	59.25;		28520.05;
+12.01.2018;			Update;		0;			25520.05;	
+12.01.2018;			Update;		0;			26020.05;	
+23.01.2018;			Update;		0;			28122.80;	
+09.04.2018;			Update;		0;			28402.25;
 EOF
diff --git a/accounts/Bank_5_Account_3.txt b/accounts/Bank_5_Account_3.txt
index 8500ed0..2d171bd 100644
--- a/accounts/Bank_5_Account_3.txt
+++ b/accounts/Bank_5_Account_3.txt
@@ -1,31 +1,31 @@
-ID;		Bank_XYZ_Account_nr_xyz_somethingsomething
+ID;			Bank_XYZ_Account_nr_xyz_somethingsomething
 Type;		Account
 Purpose;	Liquidity
 Currency;	HKD
 Transactions;
 Date(DD.MM.YYYY);	Action;		Amount;		Balance;	Notes;
-31.12.2010;		Update;		0;		120.50;
-04.02.2011;		Update;		0;		82.50;
-24.12.2012;		Update;		0;		3002.50;	Yey, Money!
-07.01.2013;		Update;		0;		3162.71;
-15.10.2014;		Update;		0;		2157.76;
-25.03.2015;		Fee;		16.20;		3157.86;
-25.06.2015;		Fee;		24.30;		5470.83;
-24.09.2015;		Fee;		21.60;		8951.61;
-11.12.2015;		Fee;		13.50;		12682.67;
-31.12.2015;		Interest;	7.90;		15698.57;
-01.01.2016;		Update;		0;		17051.57;
-23.03.2016;		Fee;		13.50;		19842.92;
-23.06.2016;		Fee;		13.50;		15140.92;
-21.09.2016;		Fee;		13.50;		13938.92;
-13.12.2016;		Fee;		13.50;		14838.92;
-30.12.2016;		Interest;	5.65;		13843.77;
-04.01.2017;		Update;		0;		14843.77;
-23.03.2017;		Fee;		13.50;		15007.22;
-21.06.2017;		Fee;		13.50;		16117.22;
-20.09.2017;		Fee;		13.50;		17117.22;		
-22.12.2017;		Fee;		13.50;		19117.22;		
-29.12.2017;		Interest;	0.25;		20117.04;
-31.03.2018;		Fee;		13.45;		24990.33;
-08.04.2018;		Update;		0;		24990.33;
+31.12.2010;			Update;		0;			120.50;
+04.02.2011;			Update;		0;			82.50;
+24.12.2012;			Update;		0;			3002.50;	Yey, Money!
+07.01.2013;			Update;		0;			3162.71;
+15.10.2014;			Update;		0;			2157.76;
+25.03.2015;			Fee;		16.20;		3157.86;
+25.06.2015;			Fee;		24.30;		5470.83;
+24.09.2015;			Fee;		21.60;		8951.61;
+11.12.2015;			Fee;		13.50;		12682.67;
+31.12.2015;			Interest;	7.90;		15698.57;
+01.01.2016;			Update;		0;			17051.57;
+23.03.2016;			Fee;		13.50;		19842.92;
+23.06.2016;			Fee;		13.50;		15140.92;
+21.09.2016;			Fee;		13.50;		13938.92;
+13.12.2016;			Fee;		13.50;		14838.92;
+30.12.2016;			Interest;	5.65;		13843.77;
+04.01.2017;			Update;		0;			14843.77;
+23.03.2017;			Fee;		13.50;		15007.22;
+21.06.2017;			Fee;		13.50;		16117.22;
+20.09.2017;			Fee;		13.50;		17117.22;		
+22.12.2017;			Fee;		13.50;		19117.22;		
+29.12.2017;			Interest;	0.25;		20117.04;
+31.03.2018;			Fee;		13.45;		24990.33;
+08.04.2018;			Update;		0;			24990.33;
 EOF
diff --git a/accounts/Cash_EUR.txt b/accounts/Cash_EUR.txt
index 4ce5f47..4496cee 100644
--- a/accounts/Cash_EUR.txt
+++ b/accounts/Cash_EUR.txt
@@ -1,8 +1,8 @@
-ID;		Under_the_mattress
+ID;			Under_the_mattress
 Type;		Account
 Purpose;	Cash
 Currency;	EUR
 Transactions;
 Date(DD.MM.YYYY);	Action;		Amount;		Balance;	Notes;
-31.12.2017;		Update;		0;		530.0;		Yey, Money!
-EOF
+31.12.2017;			Update;		0;			530.0;		Yey, Money!
+EOF	
diff --git a/accounts/Cash_USD.txt b/accounts/Cash_USD.txt
index 3235846..721bdbd 100644
--- a/accounts/Cash_USD.txt
+++ b/accounts/Cash_USD.txt
@@ -1,8 +1,8 @@
-ID;		in_the_couch
+ID;			in_the_couch
 Type;		Account
 Purpose;	Cash
 Currency;	USD
 Transactions;
 Date(DD.MM.YYYY);	Action;		Amount;		Balance;	Notes;
-31.12.2017;		Update;		0;		70.0;		Yey, Money!
+31.12.2017;			Update;		0;			70.0;		Yey, Money!
 EOF
diff --git a/investments/Portfolio_1_AAPL.txt b/investments/Portfolio_1_AAPL.txt
index 54444fb..b953e17 100644
--- a/investments/Portfolio_1_AAPL.txt
+++ b/investments/Portfolio_1_AAPL.txt
@@ -1,4 +1,4 @@
-ID;		Maybe_Pears?
+ID;			Apple_stock_in_bank_ABC
 Type;		Security
 Purpose;	Retirement_Open
 Currency;	USD
@@ -6,21 +6,21 @@ Symbol;		AAPL
 Exchange;	NASDAQ
 Transactions;
 Date(DD.MM.YYYY);	Action;		Quantity;	Price;	Cost;	Payout;		Balance;	Notes;
-11.01.2016;		Buy;		100;		179.98;	98.91;	0;		100;		The first transaction must be a buy with investments!
-29.02.2016;		Payout;		0;		0;	0;	31.25;		100;
-07.03.2016;		Payout;		0;		0;	0;	27.20;		100;
-13.04.2016;		Payout;		0;		0;	0;	34.10;		100;
-09.09.2016;		Payout;		0;		0;	0;	80.80;		100;
-07.03.2017;		Payout;		0;		0;	0;	33.00;		100;
-07.03.2017;		Fee;		0;		0;	10.00;	0.0;		100;		Multiple transactions with the same date are OK
-20.03.2017;		Payout;		0;		0;	0;	27.20;		100;
-12.04.2017;		Payout;		0;		0;	0;	34.10;		100;
-08.09.2017;		Payout;		0;		0;	0;	66.20;		100;
-22.12.2017;		Fee;		0;		0;	7.93;	0;		100;
-08.03.2018;		Payout;		0;		0;	0;	48.95;		100;
-10.03.2018;		Sell;		30;		181.00;	10.33;	0;		70;
-20.03.2018;		Payout;		0;		0;	0;	50.75;		70;
-19.04.2018;		Payout;		0;		0;	0;	44.50;		70;
-19.04.2018;		Update;		0;		172.8;	0;	0;		70;
-28.08.2020;     Split;      0;      124.81; 0;  0;      280;
+11.01.2016;			Buy;		100;		179.98;	98.91;	0;			100;		The first transaction must be a buy with investments!
+29.02.2016;			Payout;		0;			0;		0;		31.25;		100;
+07.03.2016;			Payout;		0;			0;		0;		27.20;		100;
+13.04.2016;			Payout;		0;			0;		0;		34.10;		100;
+09.09.2016;			Payout;		0;			0;		0;		80.80;		100;
+07.03.2017;			Payout;		0;			0;		0;		33.00;		100;
+07.03.2017;			Fee;		0;			0;		10.00;	0.0;		100;		Multiple transactions with the same date are OK
+20.03.2017;			Payout;		0;			0;		0;		27.20;		100;
+12.04.2017;			Payout;		0;			0;		0;		34.10;		100;
+08.09.2017;			Payout;		0;			0;		0;		66.20;		100;
+22.12.2017;			Fee;		0;			0;		7.93;	0;			100;
+08.03.2018;			Payout;		0;			0;		0;		48.95;		100;
+10.03.2018;			Sell;		30;			181.00;	10.33;	0;			70;
+20.03.2018;			Payout;		0;			0;		0;		50.75;		70;
+19.04.2018;			Payout;		0;			0;		0;		44.50;		70;
+19.04.2018;			Update;		0;			172.8;	0;		0;			70;
+28.08.2020;     	Split;      0;      	124.81; 0;  	0;      	280;
 EOF
diff --git a/investments/Portfolio_1_CSBGC7.txt b/investments/Portfolio_1_CSBGC7.txt
index e24ccdc..ad564e3 100644
--- a/investments/Portfolio_1_CSBGC7.txt
+++ b/investments/Portfolio_1_CSBGC7.txt
@@ -1,4 +1,4 @@
-ID;		Hello
+ID;			Bonds_Bank_B
 Type;		Security
 Purpose;	Retirement_Open
 Currency;	CHF
@@ -6,12 +6,12 @@ Symbol;		CSBGC7.SW
 Exchange;	SWX
 Transactions;
 Date(DD.MM.YYYY);	Action;		Quantity;	Price;	Cost;	Payout;		Balance;	Notes;
-19.11.2008;		Buy;		50;		96.35;	0;	0;		50;		The first transaction must be a buy with investments!
-21.01.2016;		Payout;		0;		0;	0;	51.50;		50;
-21.07.2016;		Payout;		0;		0;	0;	54.90;		50;
-19.01.2017;		Payout;		0;		0;	0;	53.75;		50;
-20.07.2017;		Payout;		0;		0;	0;	53.75;		50;
-20.12.2017;		Fee;		0;		0;	7.93;	0;		50;
-15.01.2018;		Payout;		0;		0;	0;	51.50;		50;
-16.04.2018;		Update;		0;		89.12;	0;	0;		50;
+19.11.2008;			Buy;		50;			96.35;	0;		0;			50;			The first transaction must be a buy with investments!
+21.01.2016;			Payout;		0;			0;		0;		51.50;		50;
+21.07.2016;			Payout;		0;			0;		0;		54.90;		50;
+19.01.2017;			Payout;		0;			0;		0;		53.75;		50;
+20.07.2017;			Payout;		0;			0;		0;		53.75;		50;
+20.12.2017;			Fee;		0;			0;		7.93;	0;			50;
+15.01.2018;			Payout;		0;			0;		0;		51.50;		50;
+16.04.2018;			Update;		0;			89.12;	0;		0;			50;
 EOF
diff --git a/investments/Portfolio_1_CreditSuisse.txt b/investments/Portfolio_1_CreditSuisse.txt
index faf6028..769e486 100644
--- a/investments/Portfolio_1_CreditSuisse.txt
+++ b/investments/Portfolio_1_CreditSuisse.txt
@@ -1,4 +1,4 @@
-ID;		SomethingBlahBlah
+ID;			Now_UBS_in_RobinHood
 Type;		Security
 Purpose;	Retirement_Open
 Currency;	CHF
@@ -6,8 +6,8 @@ Symbol;		CSGN.SW
 Exchange;	VTX
 Transactions;
 Date(DD.MM.YYYY);	Action;		Quantity;	Price;	Cost;	Payout;		Balance;	Notes;
-06.09.2012;		Buy;		100;		19.13;	0.0;	0.0;		100;		The first transaction must be a buy with investments!
-06.06.2016;		Payout;		0;		0;	0;	114.80;		100;
-20.12.2017;		Fee;		0;		0;	7.93;	0.0;		100;
-16.04.2018;		Update;		0;		15.75;	0;	0;		100;
+06.09.2012;			Buy;		100;		19.13;	0.0;	0.0;		100;		The first transaction must be a buy with investments!
+06.06.2016;			Payout;		0;			0;		0;		114.80;		100;
+20.12.2017;			Fee;		0;			0;		7.93;	0.0;		100;
+16.04.2018;			Update;		0;			15.75;	0;		0;			100;
 EOF
diff --git a/investments/Portfolio_1_IEAC.txt b/investments/Portfolio_1_IEAC.txt
index b299f3e..34fb48b 100644
--- a/investments/Portfolio_1_IEAC.txt
+++ b/investments/Portfolio_1_IEAC.txt
@@ -1,4 +1,4 @@
-ID;		Hi_there!
+ID;			Can_be_any_string_without_whitespaces
 Type;		Security
 Purpose;	Savings_House
 Currency;	CHF
@@ -6,10 +6,10 @@ Symbol;		IEAC.SW
 Exchange;	SWX
 Transactions;
 Date(DD.MM.YYYY);	Action;		Quantity;	Price;	Cost;	Payout;		Balance;	Notes;
-09.02.2016;		Buy;		60;		138.61;	83.11;	0.0;		60;		The first transaction must be a buy with investments!
-29.07.2016;		Payout;		0;		0;	0;	43.25;		60;
-27.01.2017;		Payout;		0;		0;	0;	41.50;		60;
-31.07.2017;		Payout;		0;		0;	0;	42.80;		60;
-20.12.2017;		Fee;		0;		0;	7.93;	0;		60;
-10.01.2018;		Payout;		0;		0;	0;	22.45;		60;
+09.02.2016;			Buy;		60;			138.61;	83.11;	0.0;		60;			The first transaction must be a buy with investments!
+29.07.2016;			Payout;		0;			0;		0;		43.25;		60;
+27.01.2017;			Payout;		0;			0;		0;		41.50;		60;
+31.07.2017;			Payout;		0;			0;		0;		42.80;		60;
+20.12.2017;			Fee;		0;			0;		7.93;	0;			60;
+10.01.2018;			Payout;		0;			0;		0;		22.45;		60;
 EOF
diff --git a/investments/Portfolio_2_ABBN.txt b/investments/Portfolio_2_ABBN.txt
index ea90c01..9d19e56 100644
--- a/investments/Portfolio_2_ABBN.txt
+++ b/investments/Portfolio_2_ABBN.txt
@@ -1,4 +1,4 @@
-ID;		I,robot
+ID;			ABB_stock_Bank_XYZ
 Type;		Security
 Purpose;	Retirement_Open
 Currency;	CHF
@@ -6,22 +6,22 @@ Symbol;		ABBN.SW
 Exchange;	VTX
 Transactions;
 Date(DD.MM.YYYY);	Action;		Quantity;	Price;	Cost;	Payout;		Balance;	Notes;
-26.07.2012;		Buy;		300;		16.11;	55.00;	0.0;		300;		The first transaction must be a buy with investments!
-25.03.2015;		Fee;		0;		0.0;	16.20;	0.0;		300;
-07.05.2015;		Payout;		0;		0.0;	0.0;	110.00;		300;
-25.06.2015;		Fee;		0;		0.0;	24.30;	0.0;		300;
-29.07.2015;		Payout;		0;		0.0;	0.0;	34.00;		300;
-24.09.2015;		Fee;		0;		0.0;	21.60;	0.0;		300;
-11.12.2015;		Fee;		0;		0.0;	13.50;	0.0;		300;
-23.03.2016;		Fee;		0;		0.0;	13.50;	0.0;		300;
-23.06.2016;		Fee;		0;		0.0;	13.50;	0.0;		300;
-13.07.2016;		Payout;		0;		0.0;	0.0;	148.00;		300;		dividends
-21.09.2016;		Fee;		0;		0.0;	13.50;	0.0;		300;
-13.12.2016;		Fee;		0;		0.0;	13.50;	0.0;		300;
-23.03.2017;		Fee;		0;		0.0;	13.50;	0.0;		300;
-21.04.2017;		Payout;		0;		0.0;	0.0;	98.8;		300;		dividend
-20.09.2017;		Fee;		0;		0.0;	13.50;	0.0;		300;
-27.12.2017;		Fee;		0;		0.0;	13.50;	0.0;		300;
-02.02.2018;		Sell;		100;		25.70;	53.43;	0.0;		200;
-06.02.2018;		Sell;		100;		24.10;	53.31;	0.0;		100;
+26.07.2012;			Buy;		300;		16.11;	55.00;	0.0;		300;		The first transaction must be a buy with investments!
+25.03.2015;			Fee;		0;			0.0;	16.20;	0.0;		300;
+07.05.2015;			Payout;		0;			0.0;	0.0;	110.00;		300;
+25.06.2015;			Fee;		0;			0.0;	24.30;	0.0;		300;
+29.07.2015;			Payout;		0;			0.0;	0.0;	34.00;		300;
+24.09.2015;			Fee;		0;			0.0;	21.60;	0.0;		300;
+11.12.2015;			Fee;		0;			0.0;	13.50;	0.0;		300;
+23.03.2016;			Fee;		0;			0.0;	13.50;	0.0;		300;
+23.06.2016;			Fee;		0;			0.0;	13.50;	0.0;		300;
+13.07.2016;			Payout;		0;			0.0;	0.0;	148.00;		300;		dividends
+21.09.2016;			Fee;		0;			0.0;	13.50;	0.0;		300;
+13.12.2016;			Fee;		0;			0.0;	13.50;	0.0;		300;
+23.03.2017;			Fee;		0;			0.0;	13.50;	0.0;		300;
+21.04.2017;			Payout;		0;			0.0;	0.0;	98.8;		300;		dividend
+20.09.2017;			Fee;		0;			0.0;	13.50;	0.0;		300;
+27.12.2017;			Fee;		0;			0.0;	13.50;	0.0;		300;
+02.02.2018;			Sell;		100;		25.70;	53.43;	0.0;		200;
+06.02.2018;			Sell;		100;		24.10;	53.31;	0.0;		100;
 EOF
diff --git a/investments/Portfolio_2_IBGL.txt b/investments/Portfolio_2_IBGL.txt
index c6c1bc1..293d1f0 100644
--- a/investments/Portfolio_2_IBGL.txt
+++ b/investments/Portfolio_2_IBGL.txt
@@ -1,4 +1,4 @@
-ID;		SomethingSomething
+ID;			SomethingSomething
 Type;		Security
 Purpose;	Retirement_Closed
 Currency;	CHF
@@ -6,5 +6,5 @@ Symbol;		IBGL.SW
 Exchange;	SWX
 Transactions;
 Date(DD.MM.YYYY);	Action;		Quantity;	Price;	Cost;	Payout;		Balance;	Notes;
-22.01.2018;		Buy;		20;		267.50;	15.05;	0.0;		20;		The first transaction must be a buy with investments!
+22.01.2018;			Buy;		20;			267.50;	15.05;	0.0;		20;			The first transaction must be a buy with investments!
 EOF
diff --git a/investments/Portfolio_2_LYINR.txt b/investments/Portfolio_2_LYINR.txt
index 8330b9b..db103bf 100644
--- a/investments/Portfolio_2_LYINR.txt
+++ b/investments/Portfolio_2_LYINR.txt
@@ -1,4 +1,4 @@
-ID;		Hello_Narendra
+ID;			LYINR_ISIN_XYZ
 Type;		Security
 Purpose;	Other
 Currency;	USD
@@ -6,7 +6,7 @@ Symbol;		LYINR.SW
 Exchange;	SWX
 Transactions;
 Date(DD.MM.YYYY);	Action;		Quantity;	Price;	Cost;	Payout;		Balance;	Notes;
-04.01.2016;		Buy;		200;		14.52;	15.37;	0.0;		200;		The first transaction must be a buy with investments!
-02.02.2018;		Sell;		100;		19.67;	14.36;	0.0;		100;
-07.03.2018;		Sell;		100;		18.58;	14.24;	0.0;		0;
+04.01.2016;			Buy;		200;		14.52;	15.37;	0.0;		200;		The first transaction must be a buy with investments!
+02.02.2018;			Sell;		100;		19.67;	14.36;	0.0;		100;
+07.03.2018;			Sell;		100;		18.58;	14.24;	0.0;		0;
 EOF
diff --git a/investments/Portfolio_2_XLNX.txt b/investments/Portfolio_2_XLNX.txt
index 17a3ee9..328246e 100644
--- a/investments/Portfolio_2_XLNX.txt
+++ b/investments/Portfolio_2_XLNX.txt
@@ -1,4 +1,4 @@
-ID;		FPGA_it_is
+ID;			Now_AMD
 Type;		Security
 Purpose;	Other
 Currency;	USD
@@ -6,5 +6,5 @@ Symbol;		XLNX
 Exchange;	NASDAQ
 Transactions;
 Date(DD.MM.YYYY);	Action;		Quantity;	Price;	Cost;	Payout;		Balance;	Notes;
-01.05.2017;		Buy;		50;		63.36;	34.56;	0.0;		50;		The first transaction must be a buy with investments!
+01.05.2017;			Buy;		50;			63.36;	34.56;	0.0;		50;			The first transaction must be a buy with investments!
 EOF
diff --git a/investments/Portfolio_3_RandomStock.txt b/investments/Portfolio_3_RandomStock.txt
index a182d50..3ef785a 100644
--- a/investments/Portfolio_3_RandomStock.txt
+++ b/investments/Portfolio_3_RandomStock.txt
@@ -1,4 +1,4 @@
-ID;		RandomStock_prices_must_be_given_here_or_in_marketdata_folder
+ID;			RandomStock_prices_must_be_given_here_or_in_marketdata_folder
 Type;		Security
 Purpose;	Other
 Currency;	CHF
@@ -6,9 +6,9 @@ Symbol;		RandomSymbol
 Exchange;	NASDAQ
 Transactions;
 Date(DD.MM.YYYY);	Action;		Quantity;	Price;		Cost;	Payout;		Balance;	Notes;
-09.01.2017;		Buy;			2.192;		1103.52;	2.12;	0;			2.192;
-18.01.2018;		Buy;			1.803;		1187.47;	0.00;	0;			3.995;
-14.04.2018;		Update;			0;			1157.94;	0;	0;		3.995;
-19.04.2018;		Update;			0;			1157.71;	0;	0;		3.995;
-23.04.2018;		Update;			0;			1163.86;	0;	0;		3.995;		Provide prices here, as online retrieval is not possible
+09.01.2017;			Buy;		2.192;		1103.52;	2.12;	0;			2.192;
+18.01.2018;			Buy;		1.803;		1187.47;	0.00;	0;			3.995;
+14.04.2018;			Update;		0;			1157.94;	0;		0;			3.995;
+19.04.2018;			Update;		0;			1157.71;	0;		0;			3.995;
+23.04.2018;			Update;		0;			1163.86;	0;		0;			3.995;		Provide prices here, as online retrieval is not possible
 EOF
diff --git a/investments/Portfolio_3_noSecurity.txt b/investments/Portfolio_3_noSecurity.txt
index c1e903a..c594808 100644
--- a/investments/Portfolio_3_noSecurity.txt
+++ b/investments/Portfolio_3_noSecurity.txt
@@ -1,23 +1,23 @@
-ID;		This_is_not_a_traded_security._Provide_prices_here
-Type;		Loan
+ID;			This_is_not_a_traded_security._Provide_prices_here
+Type;		None
 Purpose;	Other
 Currency;	EUR
 Symbol;		None_or_whatever
 Exchange;	None
 Transactions;
 Date(DD.MM.YYYY);	Action;		Quantity;	Price;	Cost;	Payout;		Balance;	Notes;
-05.01.2016;		Buy;		50;		50.70;	11.35;	0.0;		50;
-25.02.2016;		Payout;		0;		0;	8.40;	24.00;		50;
-07.03.2016;		Payout;		0;		0;	8.40;	24.00;		50;
-11.04.2016;		Payout;		0;		0;	12.25;	35.00;		50;	
-19.07.2016;		Payout;		0;		0;	3.50; 	10.00;		50;
-19.07.2016;		Payout;		0;		0;	0.0;	44.00;		50;
-23.07.2016;		Update;		0;		65.35;	0.0;	0.0;		50;
-02.03.2017;		Payout;		0;		0;	8.40;	24.00;		50;
-16.03.2017;		Payout;		0;		0;	8.40;	24.00;		50;
-10.04.2017;		Payout;		0;		0;	15.40;	44.00;		50;
-18.07.2017;		Payout;		0;		0;	0.0;	26.00;		50;
-18.07.2017;		Update;		0;		70.85;	0.0;	0;		50;
-18.07.2017;		Payout;		0;		0;	4.90;	14.00;		50;
-01.01.2018;		Sell;		50;		81.83;	15.60;	0.0;		0;
+05.01.2016;			Buy;		50;			50.70;	11.35;	0.0;		50;
+25.02.2016;			Payout;		0;			0;		8.40;	24.00;		50;
+07.03.2016;			Payout;		0;			0;		8.40;	24.00;		50;
+11.04.2016;			Payout;		0;			0;		12.25;	35.00;		50;	
+19.07.2016;			Payout;		0;			0;		3.50; 	10.00;		50;
+19.07.2016;			Payout;		0;			0;		0.0;	44.00;		50;
+23.07.2016;			Update;		0;			65.35;	0.0;	0.0;		50;
+02.03.2017;			Payout;		0;			0;		8.40;	24.00;		50;
+16.03.2017;			Payout;		0;			0;		8.40;	24.00;		50;
+10.04.2017;			Payout;		0;			0;		15.40;	44.00;		50;
+18.07.2017;			Payout;		0;			0;		0.0;	26.00;		50;
+18.07.2017;			Update;		0;			70.85;	0.0;	0;			50;
+18.07.2017;			Payout;		0;			0;		4.90;	14.00;		50;
+01.01.2018;			Sell;		50;			81.83;	15.60;	0.0;		0;
 EOF
diff --git a/readme.md b/readme.md
index 429e698..863686f 100644
--- a/readme.md
+++ b/readme.md
@@ -1,16 +1,20 @@
 # PROFIT
 ##### Python-Based Return On Investment and Financial Investigation Tool
-The core idea of PROFIT is to aggregate financial data from different sources (e.g., different banks, accounts, portfolios) in order to provide an overview of one's holistic financial situation. 
+The core idea of PROFIT is to aggregate (personal) financial data from different sources (e.g., different banks, accounts, portfolios) in order to provide an overview of one's holistic financial situation. 
+
+There are two core asset categories that can be tracked and analyzed by PROFIT: (Bank) accounts, and investments (like stocks). Assets can be grouped and plotted as such.
+
+All data is managed locally with human-readable CSV files.
+
 ### Features
-* Data aggregation: Accounts, investments, cash etc.
-* Long-term financial data analysis, tracking and plotting
+* Data aggregation and plotting: Accounts, investments, cash etc.
+* Personal financial data analysis, tracking and plotting
     - Asset values and returns
     - Payouts and fees
-    - Consideration of different asset purposes (e.g., retirement, liquidity etc.)
+    - Consideration of different asset purposes/groups (e.g., retirement, liquidity etc.)
     - Note: Debt is not (yet) supported
 * Automatic gathering of market prices and foreign exchange rates
 	- Data can also be provided manually
-* MIT License
 * Uses Yahoo Finance (or others; configurable via plugin/subpackage) for automatic data retrieval
 
 All data is stored and manipulated locally, using simple text files that are human-readable. Hence, there are no privacy concerns and no complex databases.