Eat some spaces, and other fixes
Update Metrics