Adjusted everythin (and corrected a few bugs in the meantime...) to make it work with our principal example.