factory section, and fix some consistency