Fix formatting and some links