Addressing Dominik's suggestions on section 5 (not finished yet)