added all links and cleaned them up