Fixed a bug where MASS was failing to stop before running onto the analysis.  Also modified the analysis xmls elements to contain underscores rather than dashes.