Merge branch 'bf/assorted_bf' into 'master'

BF:Assorted fixes

Closes #19, #20, #26, and #16

See merge request !45
3 jobs for master in 37 minutes and 19 seconds (queued for 1 second)