fixed some minor bugs regarding aborting steps and handling mode and state changes.
Merge branch 'development' of https://github.com/hesselmeulenbeld/HUniversal-Production-Utrecht into development