Some improvements at my fork