Improvements, bug fixes, and clarifications.