Add extra debug prints

Also remove an unnecessary "unless"