MINOR improvements and clarifications