Fresh snapshot for working draft

This included the fixed links.