Final touchups to new functionality.