finally merge old fixes with master

Gandalfrequested to merge
develop into master

this contains various fixes and improvements

Merge request reports