Fix some errors
Some niceties regarding links