Added some debug stuffs