Little modifications; some changes at the Datajongleur part