Added links and cleanup