Fix boxplot in multiplot case
Additional TODOs