On the road to ITER NBIs: SPIDER improvement after first operation and MITICA construction progress