More benchmark numbers and graph clean up