minot bugfixes and DataSource restore functionality added