New fixes before presentation to JESS3