more and better comments!