small cleanup / DEBUG changes