added quotes again
sorted out links