For PR434, add FMS, fix monitors, still some bugs