cleaned up and add links