add input_pictogrammes and other improvements