Modularized analytics, bugfixes for new termpredictor.