updates to improve metrics a bit