Fixed diam problem with NAccCell +misc edits