added options per histogram; adapted a few tests; other minor changes