Bloom modifications

Okay -- this is the last attempt at this.