Cleanup and visual fixes.