more changes to metrics generation

This is being surprisingly difficult