Clearing up, making some more links around the site