juggled around some debug related stuff