Renormalized to weight - and tweaks