Insight improvements

Some improvements based on Sensio Insights