Small improvements on the gadget