Improve metric functions
Update the readme