fixes #53 + some advances in section 3.3