Fixed rho_halo calculation; Added new halosteric calculation (direct rather than total-thermosteric)