Fix fiona dependacies and data loads
merged