Adding some more debug stuff