Update.

Minor improvements from past projects.