some changes in debug statements