Small fixes to metric parsing
Begun coding link metrics.