Minor enhancements.
ocd