Update documentation, fixes #230, #254, #80