Fixing more links & other stuff