Reformatted and added some links again