add some dynamic bits
more tweaks for dynamic population numbers