Update to fix links, definition, and comments