Some small changes, kbmira doesn't work now with M2Scorer, so do not use it