Improve the complex section

Together with #39, this fixes #38.