rm instrument linking; repair simulation (break endless loop); rename and move things

Joachim Wuttkerequested to merge
j.1 into main

Merge request reports