added new HHpen weighted by pwr split; minor flow fixes