Made some refinements, added some links