code cleanup, testing raw file
added EPR and NSM stats