Tutorial improved, book improved a bit