Final cleanup and tweaks.