updated, typos and edition