polishing basic units; add comments