Minor corrections (debug removal, comment updates)