Some more cleaning up, and reverting mistakes.