Merge branch 'devel' into 'main'

fix up some things

See merge request !40
1 job for main in 30 seconds (queued for 25 seconds)
Status Name Job ID Coverage
  Test
passed shellcheck #125
container

00:00:30