various bugfixes
Merge branch 'MasSimulation' of https://github.com/AlexanderStreng/HUniversal-Production-Utrecht into MasSimulation