more work and fixes
Merge branch 'dev-Jens' of https://github.com/Northcode/MCM-reboot into dev-Jens