updated to match halomod, still some improvements to be made