Removed f() params, pi from graphical model
Dumped some crap into the appendix, to be dealt with later