More tidying & link fixes