fix link and more stuff