fix comments, removed debug echo stmt, cleaned up DEBUG output