Some general code and documentation improvements in the /combination package