debug comments improved