More code cleanup.
Updated some links.
More cleanup.