Pushed some debugging changes