Mf/bunsen pull in

These are a few minor changes that shouldn't do any harm to the existing Bunsen code.