Cleanup TODO
Fix a couple of aesthetic issues
Add --label parameter for correlation entries