minor adjustments to raw.bro