Updated all links and ready to merg with Bill's copy
Fixed broken URL