fix code example
fix error message
Merge BOOK fixes, so update Changes
DZ: use [@Git]