Cleanup and tweaks.