changed links and improved table