Some Bugfixes in Data-Managment and History