a couple of more links cleaned up