reordered stuff in analyses, renamed cfa to w.