Add CSV output
Cleanup comments
Add STW concept type specific aggregations