Merge branch 'bw_fixes' into 'main'

Fixes to comments and some improvements to simplify local execution

See merge request !1