Update WP cartoon according to suggestions of Alessandro and Olivier