More and better comments