Typos and bugs. Fixes #118