Fixed highlighting and updated URLs