minor changes to HopCountAnalysis (broke it, but I need some sleep right now)