Fixes #21 also updated some text.