more and better comments