final fixes
Merge branch 'master' of github.com:syd711/mephisto_fx