fixed links and added self