fmo update

the xp fix is now working flawlessly.  I still have some more work to do
tidying up some things, but it works!