More progress on gulp tasks