Further updates to BAU

This implements a couple of tweaks to the bau implementation.