Sparkline; plugin changes; refactoring