modified classifiers and added TerminatingBlocksFinder (still needs work)