Various cosmetic improvements.