Fixes #15. Some minor self documentation changes.