added a lot of stuff
some changes to gadget
some fixes