Miscellaneous changes.
More improvements.