Fixed yet another nasty bug, added additional data collection and analysis