several improvements to figures (fix #5 and #32)