Reworked BW and minor fixes elsewhere.