Polish after whitebox testing.  Added missing BBOLD and EBOLD stuff.