Cleaned up indentation, fixed missing imports/links.

Forced merge from Evilham, caused a lot of issues, then cleaned up a lot
of the issues.