Additions to ch4: add subfig package