SFMM added and small fixes¡