Fixed a couple links and references. Moved normalize into a partial.