Various changes.
More various updates.