Various Updates

More KPIs and bug fixes