Numerous updates. Mostly aesthetic.