Cleanup, add links