Clean Master for branchwork

Cleaned the Master from my fiddling during testing. Branch off for
work/fixes. Then merge with master (after consulting the team!).