Adds some more debug info, tests if short-circuit