Documentation updates, fixes #47, fixes #48