slightly better comments, etc