Fixed/improved EFA to match the most recent data set and corresponding hypothesized EFA model (now matches the most recent SEM model).