several changes: resolution functions, signal normalization parameterization, shape, systematics etc.
minor changes
foo
merge conflicts with previous commits (I hate GIT)