Fixed the annoying problem plus added more stuff into the gadget ...
Some refactorizations, fixes and checks.