Update with minor clarifications and adjustments