make it work out of the box / fix some typos