some links and cleanup