clean up and add population type arg..