Improvements to ratchet
Repackaging of gadgets