Some improvements here and there, #PF still there.