Links work again
General fixes