Cleaning it up.

Just fixing everything and making a final sweep down.