Changed versions to downloads.
Some code cleanup.
Updated Metrics version.