Fixed highlighting
Fixed some links