Minor improvements

Conflicts:
	src/main/scala/de/fau/dryrun/dataextractor/Colldata.scala
	src/main/scala/de/fau/dryrun/dataextractor/DEuip1.scala
Fix some bugs and make more robust