updated packages, made metric/grouping key choices more smarter