ENH: better figures and pdf organization