Bugfix in insup uploader
Refactoring and new features