Added Rivet analysis.
Cleanup...