Fixed Links and Improvements