Improve docs

Also, this branch fixes #3