more link stuff
cleanup
new links