Add more content, fix some inconsistencies in gadget implementations.