Corrections and simplifications

m.puchnerrequested to merge
correctionsAndSimplifications into develop
  • a few corrections
  • simplified GUI implementation
  • removed obsolete code

Merge request reports