fix things and links