Some more improvements
More Improvements, links are missing
Adding missing links