Fixes and clarifications.