Uncommented and added useful links