Cleanup, minor updates, links