Minor updates.
More improvements.