Fixing bugs in Bandwidth reports and more cleanup