tweaks for new PopBasis and general model