Update documentation, minor cleanup