Fixed some output, added checks for collision matrix entries