FASA Bugfixes, CMES WIP

CMES very much still a work in progress. Do not use.
Merge pull request #93 from Felger/master

FASA Bugfixes, CMES WIP