Updates to FMS

Various changes