Adding/Improving debug statements