mostly w.r.t. N in cigars

changes after so many revisions