additional refactoring / bugfixes, predictor-based summaries correctly displayed