Clean up.
Various updates.