Some cleanup and refactoring
Simplified warning about warnings
Updated confusion matrix for D3 demo