various tweaks
Merge branch 'comms-max' of github.com:maxott/omf6 into comms-max