cleanup + added multiband plotting