link correction and other stuff