Added some more debugging stuff