fixing some issues in the EP code.
fixes some serious regressions in EP
license file
Merge branch 'master' into chalk_import

Conflicts:
	LICENSE