Added Links, A few modifications