rename bw_mean to bw, other fixes
17 files changed