Added links and many other things...