more comments improved