severals FE updates